Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:20:34 +0000 (19:20 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:20:34 +0000 (19:20 +0200)
commitfa6e9c11dbad3949a66eae77dfe9246de1dd0b3a
treef44273f7639976da06db50ab7fa68979570a328a
parenta58c9004c82f4ce5e6d5052a175fe54dad128edc
parente5e41a472ae1ef6e0157d8b614888a8961ed7fd1
Merge from trunk.
etc/NEWS
src/emacs.c
src/w32term.c